From 5ebb4de45c501ae12964a244ccd85fe1169a5f7c Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 10 Apr 2017 15:21:48 +0200 Subject: [PATCH] update Xen version to 4.8.1 --- Config.mk | 8 +++----- xen/Makefile | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Config.mk b/Config.mk index a3d1934c92..1dc6603ca3 100644 --- a/Config.mk +++ b/Config.mk @@ -277,8 +277,8 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= bc54e50e0fe03c570014f363b547426913e92449 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.8.0 -MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.8.0 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.8.1 +MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.8.1 # Wed Sep 28 11:50:04 2016 +0200 # minios: fix build issue with xen_*mb defines @@ -289,9 +289,7 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.10.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 3bed93d7724564e15b1025723af81d2971bb0e4b -# Thu Mar 9 11:14:55 2017 +0000 -# cirrus/vnc: zap drop bitblit support from console code. +QEMU_TRADITIONAL_REVISION ?= xen-4.8.1 # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. diff --git a/xen/Makefile b/xen/Makefile index d0675ec331..02b79d915f 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 8 -export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- 2.30.2